bitkeeper revision 1.304.1.1 (3f0ada3dy1hCToaW0oVc9Hv1u6YBIQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk

diff --cc xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
index 69577000e0c55eef0b38df75d5389157d88d999b,5abc05d05fc2d53c473efc21ee3401e6fef3de82..987a94b0e2027e2d88b7ad389f419bd958c227e2
--- 1/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
--- 2/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
+++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
@@@ -52,8 -50,21 +52,8 @@@ static struct proc_dir_entry *dom0_cmd_
  static struct proc_dir_entry *dom_list_intf;
  
  unsigned long direct_mmap(unsigned long, unsigned long, pgprot_t, int, int);
- int direct_unmap(unsigned long, unsigned long);
+ int direct_unmap(struct mm_struct *, unsigned long, unsigned long);
  
 -static unsigned char readbuf[1204];
 -
 -static int cmd_read_proc(char *page, char **start, off_t off,
 -                         int count, int *eof, void *data)
 -{
 -    strcpy(page, readbuf);
 -    *readbuf = '\0';
 -    *eof = 1;
 -    *start = page;
 -    return strlen(page);
 -}
 -
  static ssize_t dom_usage_read(struct file * file, char * buff, size_t size, loff_t * off)
  {
      char str[256];
@@@ -156,11 -158,9 +156,11 @@@ static ssize_t dom_mem_write(struct fil
  {
      dom_mem_t mem_data;
      
 +    printk("dom_mem_write called: Shouldn't happen.\n");
 +
      copy_from_user(&mem_data, (dom_mem_t *)buff, sizeof(dom_mem_t));
      
-     if ( direct_unmap(mem_data.vaddr, 
+     if ( direct_unmap(current->mm, mem_data.vaddr, 
                        mem_data.tot_pages << PAGE_SHIFT) == 0 ) {
          return sizeof(sizeof(dom_mem_t));
      } else {

diff --cc xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c
Simple merge